Fixing UI step by step