Added Layouts and changed visual UI