diverse fixes & layout