More Linker Error Fixes

also some basic layout fixes.