Layout fix by @tblasv