Fix top margin issue for better responsiveness and clean comments