Fixed #301 and #312 and work done for the print design (#271)