Added 60px padding and cleaned up code