Layout fix
Merge branch 'live' of https://github.com/OlegYarosh/pin into live