Fixed layout issues

Fixed #11