Nightly commit: Front-end design refactor