Changes in layout and tried some db stuff