[FIX] styling and UI fix