Desktop Layout

and fixed some bits