Layout_finish

Finished final detailes of layout