Updated layout using Butterfly UI