Minor Bug Fix, Changes in Styles of Controls