Feature/design details

#83 
#76