admin page done with media queries
Merging issue-32 into develop and resolved conflicts