Small clean up
Initial version of S57  samples
Fixing UI for Phone