final fixes & layout