Fixed and added minor visual aspects