fixed minor bugs, adjusted layout