Fixed layout issues (AT LAST!!)