Clean up - some fixes and finish integration of semantic-ui