Some Bugfixes(FC's) and UI Fixes for issue #11