Removed debug and fix styles