Rework style and UX