Cleanup styling issues