layout and picture fixes