merging for db update
Design for beta finished, some known iPad styling issues