Fixed location issues and aesthetics