Duration reimplemented, layout changed