Some cleanup and moving around
Work on issue #32
Different settings depending on the Api level.