Updated a bunch of stuff & changed layout somewhat