Fixed positioning and minor bugs