Fixed iPad layout issues. Changed constant variable names