Corrected problems and added Home button