Fixing layout warnings
Merge branch 'master' of https://github.com/lz1asl/CaveSurvey.git