Layout changes and battery works