reworking app layout