update: sort of finished layout