FIX: Multiple styling and functional issues