Update styling & add consistent button placement. Adding back buttons although they don't function... yet