reworked layout and fixed issues