Issue 18: Fixed layout issues