Fixed Adapter

Some views still need to be fixed but I'll fix that when I get home...
unless you want to do it.