Split views into different files and fixed admin submit picks