Feature/8 pickup

Added pickup types and messed with the layout once again. Derse, if you could give me a link for the layout stuff, that would be great.