Made layout more simple. Fixed texts to match the new layout.