Improve layout and use correct keys
Move shelfMark up