fixed basic layout. Not completely done yet