Rewrote Controller, reformatted Screen