Cleanup, added ViewHolder pattern to adapters, finished stuff