fixed layout issues
TESTING