More modifications

Tab bug fixed