Changed a little, trying to implement tabs