gived up on minor picture layout fixes