Re-order layout and fixing some style

Aleksander Vegsundrequested to merge
inv_dev into develop

changed the element layout. table and graph still not properly implemented

Merge request reports