Added view/hide feature, update layout & styles