Redesign hypermedia part
Fix merge of old design