-- improved layout
-- improved layout, changed table class