Merge pull request #42 from Nawuko/master

LS: iPad style WIP
LS: Overlapping bug in latest commit