Bug fix and layout change

Fixed emphasis bug. Changed layout of short operations to TableLayout
(it's more flexible atm).