Layout Update

#37