Update: fixing layout