before branching
general pages done
general pages done for now
working icons
buttons working