version 7

Fixed some layout
Added more CSS