diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp
index 08e8459fd36..b7a7de81e4b 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -16,7 +16,7 @@
     MACROS
 ***************************************************************************/
 
-#define VERBOSE 1
+//#define VERBOSE 1
 //#define LOG_OUTPUT_STREAM std::cout
 #include "logmacro.h"
 
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index e3c94231600..13117f91258 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -60,18 +60,7 @@
  * ----------------------------------------------------------
  *
  *  TODO:
- *  - Finish 3 x ACIA6850, host and remote interface left, terminal works
- *  - Finish 1 x 68230 Motorola, Parallel Interface / Timer as required by ROM
- *    - Configure PIT to the Centronics device printer interface as
- *      supported by ROM (DONE)
- *  - Add 1 x Abort Switch
- *  - Add 1 x Reset Switch
- *  - Add 1 x Halt LED
- *  - Add a jumper field device as supported by PCB
- *  - Add configurable serial connector between ACIA:s and
- *    - Real terminal emulator, ie rs232 "socket"
- *    - Debug console
- *  - Add VME bus driver
+ *  - Add internal layout with switches and leds
  *
  ****************************************************************************/
 
@@ -91,6 +80,8 @@
 #include "bus/vme/vme_fcisio.h"
 #include "bus/vme/vme_fcscsi.h"
 
+#include "fccpu1.lh"
+
 /*
  * The baudrate on the Force68k CPU-1 to CPU-6 is generated by a Motorola 14411 bitrate generator
  * The CPU-6 documents matches the circuits that I could find on the CPU-1 board.
@@ -548,6 +539,7 @@ void force68k_state::fccpu1(machine_config &config)
 	/* basic machine hardware */
 	M68000(config, m_maincpu, XTAL(16'000'000) / 2);
 	m_maincpu->set_addrmap(AS_PROGRAM, &force68k_state::force68k_mem);
+	config.set_default_layout(layout_fccpu1);
 
 	/* P3/Host Port config
 	 * LO command causes ROM monitor to expect S-records on HOST port by default
@@ -651,7 +643,7 @@ void force68k_state::fccpu6vb(machine_config &config)
 /* ROM definitions */
 ROM_START (fccpu1)
 	ROM_REGION (0x1000000, "maincpu", 0)
-	ROM_DEFAULT_BIOS("forcemon-1.0l")
+	ROM_DEFAULT_BIOS("forcebug-1.1")
 
 	ROM_SYSTEM_BIOS(0, "forcemon-1.0l", "Force Computers SYS68K/CPU-1 Force Monitor 1.0L")
 	ROMX_LOAD ("fccpu1v1.0l.j8.bin", 0x080001, 0x2000, CRC (3ac6f08f) SHA1 (502f6547b508d8732bd68bbbb2402d8c30fefc3b), ROM_SKIP(1) | ROM_BIOS(0))
diff --git a/src/mame/layout/fccpu1.lay b/src/mame/layout/fccpu1.lay
index 0655960a266..ef544908740 100644
--- a/src/mame/layout/fccpu1.lay
+++ b/src/mame/layout/fccpu1.lay
@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
-<!-- fccpu1.lay -->
-<!-- 2015-07-27: Initial version.  [JLE] -->
+<!--
+license:CC0
+copyright-holders:Joakim Larsson Edstrom
+Force Computers CPU-1 layout
+-->
 <mamelayout version="2">
-	<element name="front">
-				<image file="front.png" />
-	</element>
+	<element name="silver"> <rect><color red="0.75" green="0.75" blue="0.75" /></rect></element>
+  
+	<group name="front">
+		<bezel element="silver"><bounds x="0" y="0" width="36" height="480" /></bezel>
+	</group>
+	
 	<view name="Force Computers SYS68K/CPU-1">
-		<screen index="0">
-			<bounds left="100" top="0" right="640" bottom="480" />
-		</screen>
-	<bezel name="frontpanel" element="front">
-		<bounds x="0" y="0" width="36" height="480" />
-	</bezel>
+		<screen index="0"><bounds x="50" y="0" width="640" height="480" /></screen>
+		<group ref="front"><bounds x="0" y="0" width="36" height="480" /></group>
 	</view>
 </mamelayout>