addding proper layouts