Finalizing some minor design details. More to come, it's like 2 am as i'm typing this and I have a test tomm
