front-end is beautiful
merged