Documented code & some layout modifications