Fixes for new API spec

Updated layout
Renamed fields according to new API naming
Added bottling images column