css fix
finalized display
Merge remote-tracking branch 'aburkato/master' into server-testing