removed some warnings
fixed collision with finish button and page label
Merge remote-tracking branch 'origin/master'