bug fixes & layout continuing