Working on layout and perrrtyyy neess