Modified layouts, cleaned code, removed warning