[Main] Working on CSS Fix