Redesigned Main.xml