Solve Layout issues and follow Naming conventions